Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix SASL external authentication in stream plugin (backport #8488) (backport #8489) #8490

Merged
merged 3 commits into from
Jun 6, 2023
Merged

Fix SASL external authentication in stream plugin (backport #8488) (backport #8489) #8490

merged 3 commits into from
Jun 6, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 6, 2023

This is an automatic backport of pull request #8489 done by Mergify.
Cherry-pick of a24b443 has failed:

On branch mergify/bp/v3.11.x/pr-8489
Your branch is ahead of 'origin/v3.11.x' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit a24b44347a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbitmq_stream/src/rabbit_stream_reader.erl

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@acogoluegnes @mergify
Fix SASL external authentication in stream plugin
40df6df 
(cherry picked from commit 2134749)
(cherry picked from commit 540c761)
@acogoluegnes @mergify
Polish authentication in stream reader
5bdaf04 
(cherry picked from commit 6c14d73)
(cherry picked from commit a24b443)

# Conflicts:
#	deps/rabbitmq_stream/src/rabbit_stream_reader.erl
@acogoluegnes acogoluegnes merged commit a9a32e9 into v3.11.x Jun 6, 2023
16 checks passed
@acogoluegnes acogoluegnes deleted the mergify/bp/v3.11.x/pr-8489 branch June 6, 2023 14:16
@mergify mergify bot mentioned this pull request Jun 6, 2023
Merged
@acogoluegnes acogoluegnes added this to the 3.11.19 milestone Jun 6, 2023
michaelklishin added a commit that referenced this pull request Jun 6, 2023
@michaelklishin
Merge pull request #8492 from rabbitmq/mergify/bp/v3.10.x/pr-8490
7c89461 
Fix SASL external authentication in stream plugin (backport #8488) (backport #8489) (backport #8490)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
conflicts
Projects
None yet
Milestone
3.11.19
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@acogoluegnes